merge from trunk
authorJoakim Verona <joakim@verona.se>
Wed, 21 Aug 2013 06:33:57 +0000 (08:33 +0200)
committerJoakim Verona <joakim@verona.se>
Wed, 21 Aug 2013 06:33:57 +0000 (08:33 +0200)
1  2 
configure.ac

diff --cc configure.ac
Simple merge